Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some fixes for bugs noticed while migrating to Hugo #1855

Merged
merged 5 commits into from
Jul 19, 2024

Conversation

dscho
Copy link
Member

@dscho dscho commented Jul 19, 2024

Changes

  • Fixes a couple HTML mistakes.
  • Removes an obsolete banner that hasn't been shown in years.
  • Reinstates the Malaysian translation of the ProGit book that was dropped for incorrect reasons.
  • Fixes rendering of the synopses of the git-clone and the git-init manual pages.

Context

I encountered the bugs that are fixed by this PRs while working on the migration from a Rails App to GitHub Pages. It would be good to merge them early.

dscho added 5 commits July 19, 2024 10:48
This has been introduced in 38c17b0 (sidebar is a shared partial now,
2012-05-02) and it looks like some unwanted Intellisense left-over.

Signed-off-by: Johannes Schindelin <[email protected]>
This clearly wanted to be an end tag.

Signed-off-by: Johannes Schindelin <[email protected]>
We have not shown the banner in years. Let's just drop it.

Signed-off-by: Johannes Schindelin <[email protected]>
Contrary to the claim of that commit, that repository _does_ exist.

Besides, it is referenced in quite a few places, e.g. in
`app/views/books/_translations.html.erb`. Therefore we would either
remove those references (that were forgotten in the commit that
removed the Malaysian translation), or reinstate the entry in
`@all_books`. Let's do the latter.

This reverts commit 0f82f6f.

Signed-off-by: Johannes Schindelin <[email protected]>
Since git/git@76880f0510c (doc: git-clone: apply new documentation
formatting guidelines, 2024-03-29) and its parent commit, the synopses
of the manual pages of the `git clone` and the `git init` command are
rendered in a different way.

This matters because the changes were clearly only tested with AsciiDoc,
but not with AsciiDoctor. Using the latter, the formatting is all off,
unless the default stylesheet is overridden.

On Git's home page, AsciiDoctor is used to render the manual pages, and
the default stylesheet is overridden.

However, the synopses still look unpleasant to my eye, e.g. because of
the inconsistent background color of the `<code>` blocks.

This commit changes the style of the `<code>` blocks in the synopses so
that they flow better again, visually.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho requested a review from pedrorijo91 July 19, 2024 09:02
@dscho dscho self-assigned this Jul 19, 2024
Copy link
Member

@ttaylorr ttaylorr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These all look very reasonable, and I'm glad to see that you are picking up the Hugo migration work again! Looking forward to seeing it shape up.

@ttaylorr ttaylorr merged commit fb88c03 into git:main Jul 19, 2024
1 check passed
@dscho dscho deleted the upstream-fixes branch July 20, 2024 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants